From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 3 Oct 2008 08:42:11 +0000 (+0100)
Subject: pygrub: fix the parameter `default' and `timeout' in elilo.conf
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14091^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=688581c472af0cd499ac133f8ec52325fc601a19;p=xen.git

pygrub: fix the parameter `default' and `timeout' in elilo.conf

This patch fixes two issues related to the parameter `default' and
`timeout' in elilo.conf:

- LiloConf.py cannot interpret the parameter `default' and
  `timeout'. The first kernel always boot up even if the second kernel
  is specified by `default'. And `timeout' is ignored.

  This issue is introduced by cset 15953:70bb28b62ffb.

- If two kernels or more are installed, the last kernel cannot boot
  up even if it is specified by `default'.

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
---

diff --git a/tools/pygrub/src/LiloConf.py b/tools/pygrub/src/LiloConf.py
index deb94998b9..9d69a9446b 100644
--- a/tools/pygrub/src/LiloConf.py
+++ b/tools/pygrub/src/LiloConf.py
@@ -142,7 +142,7 @@ class LiloConfigFile(object):
         self.images.append(image)
 
     def _get_default(self):
-        for i in range(0, len(self.images) - 1):
+        for i in range(len(self.images)):
             if self.images[i].title == self._default:
                 return i
         return 0
@@ -150,8 +150,8 @@ class LiloConfigFile(object):
         self._default = val
     default = property(_get_default, _set_default)
 
-    commands = { "default": "self.default",
-                 "timeout": "self.timeout",
+    commands = { "default": "default",
+                 "timeout": "timeout",
                  "prompt": None,
                  "relocatable": None,
                  }